netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 11 Jan 2023 16:07:33 +0000 (17:07 +0100)
committerSalvatore Bonaccorso <carnil@debian.org>
Sat, 21 Jan 2023 14:35:48 +0000 (14:35 +0000)
commit50ea5b78666e3482aa357d01c539bca1ee93af21
tree427cd36dc7743cc6f99fa55f03be225faabddc85
parent180b889f20ebf952cc9e6a61b11b245dbe507606
netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits

Origin: https://git.kernel.org/linus/696e1a48b1a1b01edad542a1ef293665864a4dd0
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2023-0179

If the offset + length goes over the ethernet + vlan header, then the
length is adjusted to copy the bytes that are within the boundaries of
the vlan_ethhdr scratchpad area. The remaining bytes beyond ethernet +
vlan header are copied directly from the skbuff data area.

Fix incorrect arithmetic operator: subtract, not add, the size of the
vlan header in case of double-tagged packets to adjust the length
accordingly to address CVE-2023-0179.

Reported-by: Davide Ornaghi <d.ornaghi97@gmail.com>
Fixes: f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name netfilter-nft_payload-incorrect-arithmetics-when-fet.patch
net/netfilter/nft_payload.c